From b582b9903ad36bb98dd0ceda6b609d79c9af9ca0 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Mon, 29 Nov 2004 12:07:12 +0000 Subject: [PATCH] bitkeeper revision 1.1159.187.33 (41ab10f0GLXR1qCvGRT8TTbIpm5j7A) Fix ioremap() to only expect the lowmem ISA region to be fixmap()ed in privileged builds. --- linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c b/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c index 1273a9a1aa..7cec83afd6 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c @@ -154,11 +154,13 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l if (!size || last_addr < phys_addr) return NULL; +#ifdef CONFIG_XEN_PRIVILEGED_GUEST /* * Don't remap the low PCI/ISA area, it's always mapped.. */ if (phys_addr >= 0x0 && last_addr < 0x100000) return isa_bus_to_virt(phys_addr); +#endif /* * Don't allow anybody to remap normal RAM that we're using.. @@ -287,11 +289,13 @@ void __init *bt_ioremap(unsigned long phys_addr, unsigned long size) if (!size || last_addr < phys_addr) return NULL; +#ifdef CONFIG_XEN_PRIVILEGED_GUEST /* * Don't remap the low PCI/ISA area, it's always mapped.. */ if (phys_addr >= 0x0 && last_addr < 0x100000) return isa_bus_to_virt(phys_addr); +#endif /* * Mappings have to be page-aligned -- 2.30.2